From 1c9ffdb16cc20296a25c057ddc23d31a031fd1bf Mon Sep 17 00:00:00 2001
From: Anton Gladky <gladk@debian.org>
Date: Sat, 18 Sep 2021 07:13:35 +0200
Subject: [PATCH] Revert "Try to fix salsa-build"

This reverts commit 43ef002e88db1a9c77b049a1275d57cbafded8ec.
---
 debian/.gitlab-ci.yml | 7 -------
 debian/rules          | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
index 8aca11a81..26871b96e 100644
--- a/debian/.gitlab-ci.yml
+++ b/debian/.gitlab-ci.yml
@@ -1,9 +1,2 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
-
-variables:
-  SALSABUILD: "YES"
-  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: "yes"
-
-reprotest:
-  allow_failure: true
diff --git a/debian/rules b/debian/rules
index 7fbebee27..e28c06c6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
-# If SALSABUILD is set we want to drop debug info as well
-ifneq ($(SALSABUILD),)
-  export DEB_CXXFLAGS_MAINT_APPEND += -g0
-endif
-
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper
 
-- 
2.30.2